From b9db1a54104c926e062fced79714669833451d1b Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 25 Aug 2017 16:50:30 +0200 Subject: [PATCH] notebook: Update to using GdkEvent API --- gtk/gtknotebook.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index db0d9e72a0..d1f90ab3f3 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2265,7 +2265,7 @@ gtk_notebook_gesture_pressed (GtkGestureMultiPress *gesture, button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)); event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence); - if (event->type != GDK_BUTTON_PRESS || !priv->children) + if (gdk_event_get_event_type (event) != GDK_BUTTON_PRESS || !priv->children) return; arrow = gtk_notebook_get_arrow (notebook, x, y); @@ -2549,7 +2549,7 @@ gtk_notebook_gesture_released (GtkGestureMultiPress *gesture, if (!event) return; - if (event->type != GDK_BUTTON_RELEASE) + if (gdk_event_get_event_type (event) != GDK_BUTTON_RELEASE) return; if (priv->pressed_button != button) @@ -2663,22 +2663,26 @@ gtk_notebook_motion_notify (GtkWidget *widget, GtkNotebook *notebook = GTK_NOTEBOOK (widget); GtkNotebookPrivate *priv = notebook->priv; GtkNotebookPage *page; + gdouble x, y; + guint state; page = priv->cur_page; - if (!page) + if (!page || + !gdk_event_get_state ((GdkEvent *) event, &state) || + !gdk_event_get_coords ((GdkEvent *) event, &x, &y)) return FALSE; - if (!(event->state & GDK_BUTTON1_MASK) && + if (!(state & GDK_BUTTON1_MASK) && priv->pressed_button != 0) { gtk_notebook_stop_reorder (notebook); stop_scrolling (notebook); } - priv->mouse_x = event->x; - priv->mouse_y = event->y; + priv->mouse_x = x; + priv->mouse_y = y; if (priv->pressed_button == 0) return FALSE; -- 2.30.2